From 5641fba7c690cc9c87eed00d3e7c1bf560a4d8c6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 13 Jul 2014 13:34:59 -0400 Subject: [PATCH] Adwaita: Try to fix up selection touch handles The text handles reuse the style context from their parent widget, and just add .cursor-handle. That means that the more specific entry selectors override the .cursor-handle theming unless we select for .entry.cursor-handle. We also need to work harder to keep the .entry styling from drawing decorations around the outlines. --- gtk/resources/theme/Adwaita/_common.scss | 3 +++ gtk/resources/theme/Adwaita/gtk-contained-dark.css | 7 ++++++- gtk/resources/theme/Adwaita/gtk-contained.css | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index b7560cccb2..f9f10de07c 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -1054,9 +1054,12 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells } //touch selection handlebars for the Popover.osd above +.entry.cursor-handle, .cursor-handle { background-color: transparent; background-image: none; + box-shadow: none; + border-style: none; &.top { -gtk-icon-source: -gtk-icontheme('selection-start-symbolic'); } &.bottom { -gtk-icon-source: -gtk-icontheme('selection-end-symbolic'); } } diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index acddbd96d2..7ee6b6f4d3 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -1196,11 +1196,16 @@ GtkTreeView.view.progressbar { border-color: rgba(102, 102, 102, 0.8); color: #939695; } +.entry.cursor-handle, .cursor-handle { background-color: transparent; - background-image: none; } + background-image: none; + box-shadow: none; + border-style: none; } + .entry.cursor-handle.top, .cursor-handle.top { -gtk-icon-source: -gtk-icontheme("selection-start-symbolic"); } + .entry.cursor-handle.bottom, .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index fde3cc1853..4ed40da049 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -1189,11 +1189,16 @@ GtkTreeView.view.progressbar { border-color: rgba(102, 102, 102, 0.8); color: #8d9091; } +.entry.cursor-handle, .cursor-handle { background-color: transparent; - background-image: none; } + background-image: none; + box-shadow: none; + border-style: none; } + .entry.cursor-handle.top, .cursor-handle.top { -gtk-icon-source: -gtk-icontheme("selection-start-symbolic"); } + .entry.cursor-handle.bottom, .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } -- 2.30.2